From: Jyrki Gadinger <nilsding@nilsding.org>
Date: Fri, 25 Jul 2025 13:06:34 +0000 (+0200)
Subject: Merge pull request #8487 from nextcloud/backport/8486/stable-3.16
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1^2~13^2^2~3
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=187b5bc3ad359b8fd8783a86fa703def9537e827;p=nextcloud-desktop.git

Merge pull request #8487 from nextcloud/backport/8486/stable-3.16

[stable-3.16] perf(activitylistmodel): store conflicts in a separate list
---

187b5bc3ad359b8fd8783a86fa703def9537e827